expand check to match Rails generated Dockerfiles #148
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
An example: ``` ARG RUBY_VERSION=3.4.2 FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base ```
albus522
approved these changes
Feb 25, 2025
| @@ -418,7 +418,7 @@ def generate_app | |||
| # Older versions no longer release new images | |||
| matching_ruby = [">= 3.4.2", "~> 3.3.7", "~> 3.2.7", "~> 3.1.7"].any? { |v| Gem::Requirement.new(v).satisfied_by?(Gem.ruby_version) } | |||
| # Only slim and alpine are missing libyaml-dev/yaml-dev | |||
| matching_image = /FROM ruby:.+-(alpine|slim)/i.match?(dockerfile) | |||
| matching_image = /FROM .*ruby:.+-(alpine|slim)/i.match?(dockerfile) | |||
There was a problem hiding this comment.
Maybe?
Suggested change
| matching_image = /FROM .*ruby:.+-(alpine|slim)/i.match?(dockerfile) | |
| matching_image = /FROM .*\/ruby:.+-(alpine|slim)/i.match?(dockerfile) |
There was a problem hiding this comment.
That suggestion is wrong
There was a problem hiding this comment.
Suggested change
| matching_image = /FROM .*ruby:.+-(alpine|slim)/i.match?(dockerfile) | |
| # https://rubular.com/r/Jb4LEfrMSmxkp9 | |
| matching_image = /FROM (.*\/)?ruby:(.+-)?(alpine|slim)/i.match?(dockerfile) |
There was a problem hiding this comment.
This should do the trick:
@@ -418,7 +418,7 @@ class DockerfileGenerator < Rails::Generators::Base
# Older versions no longer release new images
matching_ruby = [">= 3.4.2", "~> 3.3.7", "~> 3.2.7", "~> 3.1.7"].any? { |v| Gem::Requirement.new(v).satisfied_by?(Gem.ruby_version) }
# Only slim and alpine are missing libyaml-dev/yaml-dev
- matching_image = /FROM .*ruby:.+-(alpine|slim)/i.match?(dockerfile)
+ matching_image = /FROM (|.+/)ruby:.+-(alpine|slim)/i.match?(dockerfile)
|
Did you notice my updated suggestion with test cases? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An example: